Improved readability and increased timeouts in tests.