CSPACE-6323: Update app layer test files to reflect config changes.
Merge branch 'master' into CSPACE-6323
Merge pull request #125 from ray-lee/CSPACE-6323

CSPACE-6323: Fix broken app layer test