Created basic routing.
Minor fixes.
Small change the the way flags are named withing test script. Now more descriptive.