Fixing various test failures that are all my fault.