Fixing some minor settings in the tests