Added tests for the extra expire dates