Refactoring secrets tests to use data driven tests

Change-Id: Ia9da1096ff45b85b73118c4a8fa3cb456d454bfc