Issue #73 Fix redirection
Issue #73 Add correct tests