Updated tests to account for new todos