Merge "Add ResultWrapper/FakeResultWrapper tests"