[1794] Some test cases fail due to hardcoded dates (2014 April)

Fixes 1794
Changed 2014 --> 2016, 2015-->2017
This should buy us two more years :-)