Various minor test updates.