Added episodes and tests