Refactor server tests into integration and unit test buckets
Merge pull request #169 from gitMbar/dev

Refactor server tests into integration and unit test buckets