test: move controller construction to withController only
#7782
+91
−574
withController only
#7782