page factory updates

updated pages & test cases to follow page factory format