Updated unit-test