Fix problem on tests