don't leave empty CIDFile behind

This makes `--cidfile` clean up empty container ID files. These are left behind when creating the container fails.

This PR adds a test and renames the existing CIDFile tests.

Fixes #3791