HashExtra fix and tests