remove old tests
merge head