better test, mods from Dorval rmnlib, cosmetic