fix: redirection and tests