use new Service class, fix tests