Fixing more tests quirks