more fixes on tests