Fixing broken tests / query normalization

Hi, 

I believe I had previously committed some broken tests (sorry!). They're all passing now. Also fixing a big that caused some dates to get normalized weirdly.

Thanks,
Kevin