Updated unit_test