removed namespaces from test files
refactored a bit Controller class