Some cleanups

* Use more asserts in tests
* Move Request#Do to its on file