Fixes in some tests