Merge "Separate render and verify in tests"