Comment out simple tests
Merge branches 'try1' and 'try2'
remove some test methods