Minor changes on tests