Added simple test, and new routing #2