Refactored unit tests for case services

Hi Spenser,
Have re factored the unit tests for case services , can you merge them. There would be some commits for merge conflict fixes. Let me know if any merging issues arise.