Reformat RowSetFixture and Query