assertEquals is deprecated
More assertEquals fixes