Refactor out remaining SQL statements; add test for correct genre