added some more tests, also redirect helper