Test fixes
Merge remote-tracking branch 'origin/feature/adding_shows_backend' into feature/adding_shows_backend