Genres added to test
Added Genres to delegate method
Merge remote-tracking branch 'origin/master'