fixes for new test server
bug fixes