remove TODOs
mostly fixes broken sauce again
Merge pull request #655 from buzzdecafe/gentest

mostly fixes broken sauce. yet again.
Merge pull request #649 from davidchambers/todo

remove TODOs