Got the running time for the big test down below 10s again without removing any new
features.