Test updates

Fetched from upstream.