Test: fixing tests Change-Id: Ib5ef1581167905e957317fefad2fe6278918024b GitOrigin-RevId=ed4cbfed07f596ed7d675e161fea130bfc3e7034 PiperOrigin-RevId: 141510279