Update target location of test scripts in build
Update #26 - Add structured layouts to be sensitive to new key processing