Issue #122: revised test_unit of target tests for DRYing code
Issue #122: revised test_unit of target tests for DRYing code

gift-surg/GIFT-Grab,gift-surg/GIFT-Grab,gift-surg/GIFT-Grab,gift-surg/GIFT-Grab