processed pull request remarks
simplified test and added defaults to router