Moved secret functional tests to data driven tests

Moved as many tests as possible to our data driven tests
Created new data driven tests as needed.

Change-Id: I228145c9dd3964320c184ebd74617f3571d993db
Merge "Moved secret functional tests to data driven tests"