Small updates on tests