Adding more tests.
7 files changed