Before fixing invariant generation
before deleting test wrapper
MOVED TO MBEDDR.CORE