Fix on tests