Remove unnecessary information from timeout msg.

This allows easier comparison.
Add option to recreate expected files.
Re-create expected files after timeout msg change.
Fix timeout msg removal.