Merge "SiteConfiguration: Clean up test cases"