fixed minor bug in CinderDataSource
test fixes for when cinderds is not available.