Merge "Move functions useful for crypto test into their own file"