Some service implementation improvements and testing.