Enhancetest

Resolved merge conflicts and merging changes from trader-enhance branch, added additional tests