More amf_controller tests converted to use factories.