Clear Keychain after running tests + Bug fix