Allow multiple nodes
UT updates
UT updates
Change route_vals
Merge pull request #243 from Metaswitch/sto521

[Reviewer: Andy] Sto521