Updated to work with test server