Added the test server
I may not have time to finish the rest...