Ashwin/Ajay | #2229 |fixing smoke tests.
Ashwin/Ajay | #2229 |fixing sort issue.