Removed separate project for tests

Put the tests into the server side project