Pluginize
Changing terminology to 'plugin'
Updating test case include