Fixed unit-tests.