Further tweaks to tests. Last 3 issue remain in route handling.