Fix file names in require to match new naming.
Add test for page count.