Added some stability to the tests