fix song and sogbook resources, fix tests