Fix: Generate correct query types from factory
Add failure message to the test helper
Created AddTestData helper method
Ported Index tests to Xunit