Update test references based on recent layout analysis improvements
Merge pull request #31 from mduggan/update-tests

Update test references based on recent layout analysis improvements