Remove sanitization as it is handled by core function
Fix tests