Switch to calling new KeysManager output-spending fn in tests