A few fixes on your tests

Enjoy!