Added test.
Merged a couple of tests.