Merge "tests: Prefer assertSame() when comparing the integer 0"