Updated tests as per incubator-storm.