Trying to fix a test which hangs on build server