Technical Debt - seperate unit test expected queries from test logic

[dogversioning]

Since these queries can get very large, it becomes hard to manage the actual logic of the unit test - it might be better to move these to individual files instead.