Small adjustments in the tests