Remove UNIT_TEST