changed some uses of assertTrue(x == y) to assertEquals(x, y) to make
meaning clearer