fixed tests and added a TODO