Reverting back
Making tests more robust for the build server