Updated Episode, wrote more tests, added Episode to test in common