Merge "Clean up tests for FauxRequest/WebRequest"