Refs #9327 EEA; work in progress on tests