Added some tests and the server stub