Switch to using TIMESTAMPADD instead of DATE_SUB, since this works on both MySQL and H2, and reenable a unit test