Fixed these two tests due to changing error messages from the server.
Merged pull request #740
Merge branch 'v1.5'