Added support for new series per season, fixed tests