remove some tests
Merge branch 'try1'
Comment out simple tests