Minor fixes in the tests