Test are not ready yet as we need to change the model