get back to old test structure.
Merge branch 'master' of https://github.com/emre/storm