Slight testing style cleanups