cnat: improve tests