Refs #5421 Fixes for system tests.