Being dull and boring
re-packaging.
Fixing tests - added method invoker