FIX: Revert raise and improve coverage