Tweaks to test code.