refs #5054 some more bug fixes and tests