[Feature/STORM/387] Added tests