Updated unit-tests