Normalize test output for comparison on Windows
Refactoring cleanup of play-run support infrastructure