Moved services file to test project