Fix bug where we decremented the token before counting remaining
Improve test reliability by factoring out time
Update to the latest version of Clojure