some fixes on tests