Updates to run core unit tests under PCL