Merge in soln-to-alloc-map
Add quadratic tests