Fixed the unit tests and added a new todo list