Request builder test refactoring