More test improvements.