Fixing a few (not all) tests