Passing tests, added new unit test.

Next step: add all services