Additional sanitization tests and improve regex