RF - streamline Jacobian calculation and add test