More Changes to song and test.