ADDED more unit tests.