Added some more functionality to the test client/server, currently in test form