Adding more unit tests.