removed the Test controller and refactored some tests
refactored tests