Merge "Mark mutability explicitly in tests"