Refactor page object to clean tests