Updates to Site Creation logic
Further Cleanup
Preparing cuke for test script