more tests
remove dependency on querystring