+ removed a not-needed small extra complexity
+ regrouping and tweaking tests
+ renamed anyType to any
+ removed usage of deprecated arg
small code cleanup