fixup! remove workaround for express bug
fixup! rework tests to use supertest

Remove mocked req/res objects.