CLOUDIFY-1559 major storage tests refactoring