Adding to functional tests for secrets

Change-Id: I0385760d5d6debf6f95576638d3dfcb6b985bfdc
Merge "Adding to functional tests for secrets"