Merge "Refactor conformance robot test"