This issues with the date comparision in the matchers is something I fixed in another commit, so we can revert these here