Add "nocommitwait" for the two cases we test that, otherwise add assertions that we never end up dealing with anything other than the previous commit. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>