PDI-9535: Fixed unit test packages