Reconfig testing to cover routing and refactor tests