Adds length support for email + tests