Added formulae for flex models and storm.
Added tests for new formulae.