Merge "Add tests to presubmit"