Fixes tests and reworks routing tables for data processes
Merge pull request #709 from lukecampbell/data_process

Fixes tests and reworks routing tables for data processes