Merge "Removing duplicated tests that use hidden APIs"