I've made this change, and the other one about using `test()`. let's not duplicate efforts.