Moved test-specific sha1 to string method to TestUtils and a handful of minor updates.