Merge some minor changes into main
Added skeleton for integration tests, annotation to make genres optional to support tests and removed unused code
Added skeleton for integration tests, annotation to make genres optional to support tests and removed unused code