switched name for routes and server. Added more tests