Little refacto to separate world conception and life to be finished
fix tests
fix tests