Removes all nested routing and updates tests