I think I fixed tests (they are running right now).