Cope with @block being nil when importing
Remove unused import_log
Initialize @error_log
Switch tests to use run_safe with a block