Merge "Update test to ignore enum comparison errors."