remove some test methods
Merge branch 'try2'