Clean
exclude es data
Don't always start ES
Remove storage
Fix tests