unit test modal with atttributes
Merge remote-tracking branch 'origin/master'