Unfudge some multiple whatever related tests