Re-enable disasm retries and add test