Fix bug on fudge wrapper
Refactor keychain tests and make them use the fudge wrapper