Fix named queries to allow multiple statements per scenario
Make named-queries tests run independently