Fix for 566 and refactoring around Invoker

Removed usage of org.testng.ITestNGMethod#getInstances, and more
Tests passes.