Merge "Allocation API: functional tests"