Updated battle spec to remove references to song_id