changed redirect path in test after change in code
merging
merged master
fix conflict