-Forgot to add refactored/moved unit_test support
Authored by: m0slevin 2015-05-28
Parent: [r212]
Child: [r214]