Merge "Add test for redirect"