fix storm test; add helper method