Fix some issues with running unit tests on PS 1.5