Merge branch '3316895-test-fake-site' into '8.x-2.x'

Issue #3316895: Create a test to prove our fake-site is error free starting point

See merge request !555