Merge branch 'master'
EA_TEST Fixed use of IsUnsuitability and added a test for 3.12.2.3 a)
Merge branch 'UnfinishedModeling'