Add tests for keystore
Remove unnecessary log entry