Adds main class to compile
Adds more tests to client and server