Merge changes I3439a096,I2421e2d3 into main

* changes:
  Add missing @Test annotations
  Remove accidentely kept @Presubmit annotation