Un-XFAIL two tests.  Closes #4234; closes #4492.

Both issues have been fixed for some time, but issues have not been closed.
Both tests have been moved out of test_failing_integrals.py, since they no
longer fail.
Merge pull request #7277 from Tempel/cleanups

Un-XFAIL two tests.  Closes #4234; closes #4492.