Switching assertEquals to assertSame where possible.