improve coverage and style for crypto/ folder