Minor tweaks to test configuration in an attempt to reduce scope.