Fixes tests and reworks routing tables for data processes