loadOnDemand management
Update .gitignore
Factorize common tests for both strategies