Convert remaining assertEquals calls

These were split over multiple lines so the regex I used to sed the
first batch didn't catch these.
Convert assertTrue to plain asserts