The test should be a bit more reliable now