Use clj-time, fix test