tests: Fix up tests to match changes from previous commit.