Refactoring on controller
removed test unit files