Updated tests and names routes