new error messages, fix tests