Split up service tests into multiple files
Fix underscores in namespace
Merge pull request #20 from cprice404/split-service-tests-to-multiple-files

Split up service tests into multiple files