Modify test output messages to be more readable; guard against bad line endings when reconstructing srpy test file