[2.0] Refacto
[Travis] Enable new tests