Added support for convex price functions using the delta formulation and blocks. Tests were revised too.