Adding more tests.
4 files changed