Split EqualityTests inside of classes tests

Change-Id: Ie081b7f91f62fa52503304643a1f57324d9c9d6d