Updated tests to account for new todos
Merge pull request #3329 from thepeopleseason/fix_tests

Updated tests to account for new todos