Fixed tests and argument for service implementation.