I'm not 100% confident about either of these patches, so please take care with them. I also think the second patch is probaby best fixed by disabling the warning, or else a much more fundamental rewrite of the test. Rich.