Cleaned up server tests
Merge branch 'ep14'

* ep14:
  Cleaned up server tests