Refs #9327 EEA; Fixes to code, improve tests