Fixed some minor JavaDoc issues
Changed to official spelling of "Plug-in" instead of "Plugin"
Added more test coverage