CLOUDSTACK-5640: Correcting imports in test cases