Changes test structure for requests. Obviously breaks tests... [ci skip]