[FIX] Test webserver
[FIX] Kill test redis instead of terminating

otherwise it does not quit quick enough and thus breaks following tests
which try to use the same port