Started refactoring of tests
Updated serviceTest.js