Brand+episode tests+fixes