Updated routes so links are now going to their correct destinations. Also refactored tests.