Map algebra debugged; Tests updated