Changed to synchronous requests in test-suite