refs #6528. Fix tests and warnings.