Include Vadym's changes & fix the integration order for the exact solution.