add tests and modify page model