Refactor TradeTestPlugin due to TradeAPI refactor