Improve tests just a pinch.