Added additional unit tests.