Update Page class and test