Fixed some bugs in Router library
Fixed scratch-pad test app to work correctly with guthrie library refactorings