new tests for service, small improvements