Refactor some more amf_controller tests to use factories.