Small changes on tests