Merge "Check cross-references in automated tests"