I think I fixed some tests. Tres, can you review?