#14: adding todos tests and updating all existing tests