fix for routing logs and cleanup of some tests