Tidy up hash specs

This also fixes the stack too deep error