Remove a couple of unused test functions; make sure things get stored even if original key has expired