Refs #9327 EEA; fixes to test setup