Improve Page entity and add tests