Feature/multiple metadata cukes with fixes