Test Trac #5498
Changes in error messages when fixing Trac #8649

Mostly improvements, happily
Adjust "max_bytes_used" upward for T4801