Feature/storm test support

Bump up storm test error handling a little more