Attempting to debug bad PS1 match
Correct final regressions in test