Update Trader & Tests