Merge "Remove some stale TODOs from the Java Bridge tests"