Guillaume-Duret
Add test/conch models
e2a1117