Added foreach support to feature test