A lot of the test code was written before we had `with-session` and could be cleaned up by using it.