Merge pull request #3 from bryan-m-hughes/timob-13709

Timob 13709 Fleshed out the layout performance tests further