fix tests

No longer save explicit "normal" channel name in imported scores.  Also
remove explicit "normal" channel name from Cymbal in instruments.xml.
update importmidi/updateReference script