Improve integration tests for Storm

Related #267