Rrgression test cleanup