PDI-9535: Fixed unit test packages
Merge pull request #114 from mattyb149/cdh41x-shims

PDI-9535: Fixed unit test packages