Add additional unit tests.