Bug fix, and add one more test
Revert "Write more test pages"

This reverts commit 7f2b605cbfaf093480e71974406c0bdb3ab31a8e.
Revert "Revert "Write more test pages""

This reverts commit 6454e412fbbd2b0eb2aecb106877029f86a23d3f.