Make the new expiration date be consistent with the previous year(s)

The training expiration date moves every year to the date the test was taken instead of the anniversary date. We pay for a complete year however we are getting jipped out of at least one month. SDGE field now has an unwritten rule that they wont accept an FVR if the expiration date is one month or less away from the date submitted due to their backlog, so now in reality we will be paying for a year and only get 10 months of service