refactor Model test