(DO NOT REVERT) More work done on HttpRequestEngine stubbing