Tests, slight tweak to song ids/filenames