refactored Item, Page and fixed Testcases