More stuff changed on Test Dump 2