Fixing (or working around, or disabling) tests