test for no_commit & fixes