Some error-messages are slightly adjusted to better tell what invocation would be correct instead. Tests are adjusted accordingly.