add service tests, fix test structure