Remaining regression tests

See #829 and #831.