Finished work on services and tests for them