Fix story height CONTAM issue, add more tests
Merge pull request #1305 from jasondegraw/cbecc-materials-idd-CONTAM-fix

Fix story height CONTAM issue, add more tests