Refactored testing files
Separated real-API-only tests into separate class
Merge branch 'feature/issue-19-refactor-testing-for-server' into develop