Reworked service-test to fix issue #5 and removed clearServices test