refs #7303. Fix naming. Add tests.
Merge remote branch 'origin/feature/7303_peak_identification'