Add more tags to cucumber tests

Change-Id: I6e37c3043dea1f8d1ccc0d79617073e8465dd028
Merge "Add more tags to cucumber tests"