one less warning :-)
a few test fixes