A bit test cleanup