Controller Tests Refactoring