Added support for convex and nonconvex price functions using the lambda formulation, now also without blocks. Tests were slightly adjusted too.
