Split up service tests into multiple files

No code changes in this PR.  Just splits the service tests up into multiple files.