Some cleanup in the tests