Added name validation and join test