Merge "Tests for Cinder packages"