Finished tests, fixed up some overlooked bugs in services