CLOUDIFY-1730 Removed unnecessary package declarations
Fixed possible NPE in test