Faster test timeouts. Cleaner code.