Added test server. Improvements