eliminate old tests
add new tests and TODO