More tests and rewriting parts of the service interface.