Fix npm install conflict.
Refactor build
Fix tests.

After loading services into single angular module we had to define
this .service module before loading the tests.