Added additional exclusion test and a fix for nested exclusions
Merge branch 'develop'