Updated unit-testing.