Large data test cleanup and speedup