Added additional unit-tests.