Moved the service tests into service test class.
Removing redundant assertions.
Merge pull request #16 from charltonaustin/develop

Tech Debt