Updated Server Routes & Tests