Thanks zalew for the suggestion and work on a patch. Also updated, tweaked and fixed testing documentation.