Improved ISO parser and increased year range
Modified test to reflect change