Client/Server Test Stuff added