added more unit tests.