Some cleanup on request_test