Merge "Use more short array syntax in comments (/tests/)"