Added genre and tests