Fixing tests originally committed as part of issue #3742