test fix and compiler warning eliminations

[scottmessinger]

I think these were cleaned up so closing this. Thanks for submitting it and I'm sorry it was never merged!!!