Fixup of two of the tests for the new interface