More robust tests for the build server