minor fixes, mostly on tests