Reworked fix for fixture loading

A different approach to testing for this issue
Maintaing fixtures is too hard, so we can just dump a set of pages within the test

Fix #1031 
Fix #1619