Revert "Refs #5421 Updating system tests."

This reverts commit 06094c90762a84248e94af2e025ea04196168a13.
Merge remote-tracking branch 'origin/bugfix/8122_broken_systests_on_master'