Deployment Tests Cleanup

Did some cleanup of variable names and made the filename for the .json static
(site-layout.json).
Removed variable for string only used once
Merge pull request #238 from ryabouza/deployment-cleanup

Deployment Tests Cleanup