Added tests.
Merge