An attempt to fix some tests