Fix make bundle-test and keyring unit-tests