Added required Cucumber tags

Also:

- Refactored existing tags.
- Fixed whitespace.

Paired with: Chris McMahon
Bug: 64380

Change-Id: I5c65afb6046ef6cabb38225951ae6472bd5342cd