updated test to avoid name conflicts (tested separately)
Merge branch 'master' of github.com:ffleurey/ThingML