added in more unit tests.