Minor fixes on the tests