Fixing allocations test issues.
Fixing merge errors and build issues.