tweaked for test server