Improve test behaviors