Fix silly bug for with range tables and improve tests for Save operation