don't merge, test_request working about 1/2 way
fix tests