Fixed broken tests
Added more multi-episode tests and support for them