Two small steps towards getting "old cli tests (warehouse)" to run