Add tests for uncle timestamps and refactor timestamp type (cherry picked from commit abce09954b)
abce09954b