Changes annotation error and known failure Sets to Maps so that we don't have to compare on the value (which could get fixed)
Logs annotation errors that have been corrected
Moves some errors from annotation errors to known failures