part II of test_controller commit