Service and tests run

Weird performance characteristics being noticed.