T 3964 m

Move xsite random-failing tests to a separate group
Fix some outdated tests.