Improved error display.
Improved error display.
More test tweaks