More bugfixes from unit testing.  Now executes entire PHP test suit on my Ubuntu PHP
config cleanly.