fix($modal): double apply error when passed in an isolated scope
test(modal): simplify merged test fixing #582