Clean up some storm tests
Fix spurious test failures for storm
Fix up scalding + add scalding tests