PDI-9293: Fixed CDH4.2 shim unit tests