Test cleanup, few routing fixes