Updating the tests to be more robust in Hudson