Fixing peptide report tests. More cleanups.