Added extra checks in unit tests.
Explicitly make this for CDH 4.2.0.