wip: refactors and breaks up tests
[#62531072] Better page normalization to prevent under or over running limits of query
version bump