small tweaks to unit_test