Merge "Tests: correct order of assertEquals arguments"