Merge pull request #452 from apenney/pe-test-fails

Repair this by ensuring calls to mysql include the database name.
be more ignorant
Merge pull request #453 from igalic/ignorance

be more ignorant
Fixes for Ubuntu/Debian.