Toolkit, Page, UnitTest changes

Changes