Tweaks to facilitate better tests to come.