Couple of new tests and a more complete todo list