Increase number of partitions and use correct timeouts.