Fix unit tests for series parser
Fix more unit tests for series parser