Fixed up tested bits.