Merge "Tests: never use System.err"