Add test error messages.
Add two more special cases.
Add error descriptions to strings.
Strings must be compared exactly
Merge remote-tracking branch 'dima/master'