Rework of JMiBody with unit tests