Add tests for issues #410, #411, and #425.
Fix issue #425.