Un-xfail/move/delete some tests.
Add tests for 2 fixed issues.

Fixes #7327.
Fixes #3794.