Continued test cleanup