Adding more unit tests.
6 files changed