Merge "Move SpannedTestUtils into tests"