Added storm tests and refactored the storm API to make testing easier.