Update todo
much more thorough unit tests