Tweaks to test for bug hunt