Todo update + tests

make tests