Working on TestServer
Made some changes for development purposes that need to be reversed at
some point!