Remove unneeded TODO comment.
Commence design changes to address issues #12 and #17.
Continue design changes to address issues #12 and #17
Update the unit tests, excluding system tests, affected by the metadata design changes (issues #12 and #17)
Update the unit tests, excluding system tests, affected by the metadata design changes (issues #12 and #17)