Added testVars filter
Merge branch 'develop' into storm