More storm tests
New test, simplify some code