I'd think that if we convert it to EPP with data type validation then it's probably a lot safer to drop many of those tests