[2.0] Refacto
[Travsi] Enable new tests