fix broken spec tests from controllers and models