Initv2

@njam here the changes you made plus the test executor. I could not find another way to get to it.. 
May be make the tests optional?