CLOUDIFY-1759 Test refactoring
CLOUDIFY-1759 Optimize close method