Added performance test improvements;