Toolkit, Page, UnitTest changes

Changes
Merge pull request #14 from Orasi/Brian_Branch

Toolkit, Page, UnitTest changes