changed ecmp to hashed for ft
fixed merge conflicts in test.sh