small modifications to cloud testing framework