Further tweaks for test.