Removed single test class, fleshed out individual files to avoid code
dupe when testing client/server.