modify test and add model test