More tweaks on tests