Add secure support in test cases