More test improvements