Fix some cucumber tests which specify metadata ids