some cleanups and test support
fixed broken parsing of peptides