Requests tests (bug 851593), also better tests