Fixes and tests for page module