Revert "Added tests that mimick what QE's tests are doing."

This reverts commit 7f4c2016716e299761b1055382ad32e5b4208c0e.
Merge branch '1.19-candidate' into 1.19.y