Minor modification to unit_test method