Refactor request-makers [TESTS FAILING]