Put rewrite to storage with integration tests for that.