Moved services tests to the main test directory & cleaned up
unused code where possible. There are now exactly two failing tests.