Remove redundant constraints
Leave invalid entities unencoded, updated tests