More plugins and tests.