test fixes for when cinderds is not available.