fix tests and minor cs fix
Merge pull request #76 from uwej711/adjust_test_to_routing_model_change

fix tests and minor cs fix