Refractoring requests tests