Fix Genre Parsing (and some Test failures)