Partial correction of the pending tests