Fix error message
Fix random test fail