Fix Listener/Redirect + tests