Add tests in TODO