Bug fix for "No episodes" and move some tests