set_bit/clear_bit methods and tweaks to phase test.

--BRJ and CAR
Update test sequence.

--BRJ and CAR