Remove unneeded tags
Use scenario outlines