Fixes some validation tests that failed due to improved diagnostics