Implemented unit tests for TODO notes, but added TODO notes to reduce code duplication