performance test improvements