Fixed failing tests as a result of the data reload