worked on trade module and unittests