wintest: tidyups and new conf variables