Fix test-output format
Add enforce message
Merge pull request #2520 from 9rnsr/fix_pull2513

Fix pull2513