Separating mock services from main test files
Some view changes to make things prettier
Improvements on controller and service handling
More testing and general improvements