Fixed.
Amended error messages.
Fixed test.