Fix tests
Fix helper index
Merge branch 'master' of github.com:SerafimArts/Reflector