fixing models and controllers for test