Refs #8739 Update system tests to match.