Refactoring recomentadtion
Fix test models