Add request and test configuration redesing