Add test model
Add benchmark
Update tests
Make use of EMFModule