Re-designed Framework into Page Objects