Reduce difference between no MARS and MARS

Code execute with this option enabled and disabled is quite different.
Currently tests run both versions to make sure everything is fine.
In the future I hope to reduce the difference so to make possible to
have a single testing set.

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>