Merge "Revert "Add runtest formula to model""