Fix save_and_check method twice option
Fix null tests