Add two new regression tests based on issues #2235 and #2400