Merge "Adding some unit tests to presubmit"