General trimming and added load test