Added max length for names and updated tests