Refactoring for behavior responses, adding tags, and adding to secrets tests

Change-Id: I92a9189b25cafe0ee20225c5e15ab7ea7044d22e
Merge "Refactoring for behavior responses, adding tags, and adding to secrets tests"