Re-enable a few tests I had missed.

Fix integration test for the change to log entry zero.

Increase test timeouts since integration tests often take
longer than 10s for me.