refactor some tests
updated scenarios and added draft steps
got routing to accept query params