Added the tests server and more work on the tests