Test suite added.
Merging.