Macro out TODO unit tests for @ajwaller.
Refactoring work for #32. Unit tests coming next.
Missed this file.