Updated unit-tests.