Fixing various test failures that are all my fault.

Thanks for bumping into these, @kostajh.

Forgive me @ralphbean, for I have sinned; I did not run tests after submitting at least one of my previous pull requests.