Correct plugin and tests