Improved control of models and formulas testing

Change-Id: Ib8f83556cec296c52ec7bc655fc6bd395e296f20
2 files changed