Revert "Trimmed the branch to only the cram_test_utilities sub directory"

This reverts commit c564d69d10dddc963924c42c3d306e67d9dfa946.
Rebase from 'upstream'
Trimmed the branch to only the cram_test_utilities sub directory