Tweak unit tests for #2294