Updated tests and completed core path routing.