Further tweaks to test case / tuning