Added tests and test server