few tweaks on tests