Remove CVS $Id tags

The legacy tags are causing build issues in Debian.
Fixed test broken by removing ID tags.