Fixed failing unit tests (due to changes introduced in core PDI for pluggable types)