Fixed all but EqSimpleTest and started comments