Fixed a broken (old) method in test suite. Made it easy to disable page-based store.