fix model and test
update strategy and test