update tests and TODO