Fix the tests to match the plugin changes.