Bit of test cleanup