Move a line into the plugin.
Update test setup