removed one hierarchy level for crypto test options