Fixed tests
Clean up load test
Update memory usage on load test