added service; enable all tests again