Redid TestMethodVisitor - should be more stable