remove old tests, refactor