Merge "Add tests for Genre.encode/decode" into nyc-dev