Improved QueryTest.testQueryWithIndexDuringJoin()