Adding more unit tests.
3 files changed