Fixed issues with system tests.

Refs #5007