Refs #9836 - Fix system tests.