Remove usage of responseFaker to have one less thing to explain