update model, strategy and test