More general refactoring

Refs #9344
Fix failing system tests

Refs #9344