Refactor closer to MVC
Introduced comprehensive service test framework