Merge "Allocation API: add tests on backfilling allocations"