Merge "Initial Cinder tests"