Fixing tests - added method invoker