Made a test more robust for execution on the build server