Closes #68

* Also testes all factories
* Replaced service test under Service/ folder