Song class testable

Full suite for Song class finished.  Minor changes to music and parser