Merge warehouseTesting to WarehouseImpl, make tests pass.
ffff