Added assertions to test
Modify todo