Do some more test cleanup