Synchronise tests with last commit.
Fix slurpy arg allocation.