Some updates to the test plugin definitions.