Fixing various test failures that are all my fault.
Merge pull request #113 from coddingtonbear/fix_tests_apr

Fixing various test failures that are all my fault.