Refs #8587 Fixing issues with system tests.