Added tests for the new routing funtions