More test cleanup :)