More testing additions.