Moar tests
Improve secrets API