Merge pull request #148 from Mirantis/pr_enableOtherModels

enable other modes, that passes now