Add tests, remove old tests.