A bit more refinements on tests