Deployment Tests Cleanup

Did some cleanup of variable names and made the filename for the .json static
(site-layout.json).