Fix tests for rust nightly
Merge branch 'beatgammit/tmp'

* beatgammit/tmp:
  Fix tests for rust nightly