t0022: fix up broken/incomplete tests