Fixed so tests for 'NEVER' return maximum expiry of 1 year.