Update existing tests and factories to support episodes