Fix tests and comment

Change-Id: I1b7a5b053752f50544be06df36ccd2f1525afef1
fix flake

Change-Id: If4522e7079772a44e6a616245704ffb4cc4ec151