Modifications to allow tests to run on both Debian lenny and Ubuntu

Precise.