Fix man page test
Fix cinder test