Fix indexing problem, add test songs