Refs #8959 Fix for tests