Don't fuck up the TZ env var for other tests
Don't skip out the timestamp heuristic if we're given an accurate timestamp
Updated gemfile.lock
Tidy up the timezone handling and tests a little