Clarify some comments.
Add new directory for error_return tests