Add Test for OnePhase and add TwoPhase cell