Leave tests out of deployed plugin
Refactoring and improvements
Added some unit tests