Cleaned up the services test a little. Still need to increase coverage, especially for api related tests.