Added dsl for building RoutingCommands
fixed some failing tests