diff --git a/tests/ep/rbcii_MCP.mod b/tests/ep/rbcii_MCP.mod
index 698896d2d89de94818a17a4f457704d5ca260128..2351e7485f4151ec228780a48b1b063957dec218 100644
--- a/tests/ep/rbcii_MCP.mod
+++ b/tests/ep/rbcii_MCP.mod
@@ -1,5 +1,4 @@
-% RBC model  with  irreversible  investment  constraint, implemented using
-% MCP tag
+% RBC model  with  irreversible  investment  constraint, implemented using MCP tag.
 
 var k, y, L, c, A, a, mu, i;
 varexo epsilon;
@@ -11,88 +10,49 @@ psi = -0.1000;  delta = 0.0200;
 rho = 0.8000;   Astar = 1.0000;
 
 model;
-a = rho*a(-1) + epsilon;
-A = Astar*exp(a);
-y = A*(alpha*k(-1)^psi+(1-alpha)*L^psi)^(1/psi);
-k = y-c + (1-delta)*k(-1);
-(1-theta)/theta*c/(1-L) - (1-alpha)*(y/L)^(1-psi);
-(c^theta*(1-L)^(1-theta))^(1-tau)/c -mu =
-beta*(c(+1)^theta*(1-L(+1))^(1-theta))^(1-tau)/c(+1)
-*(alpha*(y(+1)/k)^(1-psi)+1-delta)+mu(+1)*(1-delta);
-i=y-c;
-[ mcp = 'i > 0' ]
-mu = 0;
-
+  a = rho*a(-1) + epsilon;
+  A = Astar*exp(a);
+  y = A*(alpha*k(-1)^psi+(1-alpha)*L^psi)^(1/psi);
+  k = y-c + (1-delta)*k(-1);
+  (1-theta)/theta*c/(1-L) - (1-alpha)*(y/L)^(1-psi);
+  (c^theta*(1-L)^(1-theta))^(1-tau)/c -mu =
+  beta*(c(+1)^theta*(1-L(+1))^(1-theta))^(1-tau)/c(+1)
+  *(alpha*(y(+1)/k)^(1-psi)+1-delta)+mu(+1)*(1-delta);
+  i=y-c;
+  [ mcp = 'i > 0' ]
+  mu = 0;
 end;
 
 
 steady_state_model;
-a = epsilon/(1-rho);
-A = Astar*exp(a);
-Output_per_unit_of_Capital=((1/beta-1+delta)/alpha)^(1/(1-psi));
-Consumption_per_unit_of_Capital=Output_per_unit_of_Capital-delta;
-Labour_per_unit_of_Capital=(((Output_per_unit_of_Capital/A)^psi-alpha)
-/(1-alpha))^(1/psi);
-Output_per_unit_of_Labour=Output_per_unit_of_Capital/Labour_per_unit_of_Capital;
-Consumption_per_unit_of_Labour=Consumption_per_unit_of_Capital
-/Labour_per_unit_of_Capital;
-% Compute steady state of the endogenous variables.
-L=1/(1+Consumption_per_unit_of_Labour/((1-alpha)*theta/(1-theta)
-*Output_per_unit_of_Labour^(1-psi)));
-c=Consumption_per_unit_of_Labour*L;
-k=L/Labour_per_unit_of_Capital;
-y=Output_per_unit_of_Capital*k;
-i=delta*k;
-mu=0;
+  a = epsilon/(1-rho);
+  A = Astar*exp(a);
+  Output_per_unit_of_Capital=((1/beta-1+delta)/alpha)^(1/(1-psi));
+  Consumption_per_unit_of_Capital=Output_per_unit_of_Capital-delta;
+  Labour_per_unit_of_Capital=(((Output_per_unit_of_Capital/A)^psi-alpha)
+  /(1-alpha))^(1/psi);
+  Output_per_unit_of_Labour=Output_per_unit_of_Capital/Labour_per_unit_of_Capital;
+  Consumption_per_unit_of_Labour=Consumption_per_unit_of_Capital
+  /Labour_per_unit_of_Capital;
+  % Compute steady state of the endogenous variables.
+  L=1/(1+Consumption_per_unit_of_Labour/((1-alpha)*theta/(1-theta)
+  *Output_per_unit_of_Labour^(1-psi)));
+  c=Consumption_per_unit_of_Labour*L;
+  k=L/Labour_per_unit_of_Capital;
+  y=Output_per_unit_of_Capital*k;
+  i=delta*k;
+  mu=0;
 end;
 
 steady;
 
-%% Perfect  foresight
-% negative  technology shock drives the  economy  to  the  bound
-%shocks;
-%var epsilon;
-%periods 1:20;
-%values -0.5;
-%end;
-%perfect_foresight_setup(periods=300);
-%perfect_foresight_solver(lmmcp, maxit=200);
-%figure
-%subplot(2,2,1)
-%plot(oo_.endo_simul(8,:)); axis  tight
-%title('investment')
-%subplot(2,2,2)
-%plot(oo_.endo_simul(2,:)); axis  tight
-%title('output')
-%subplot(2,2,3)
-%plot(oo_.endo_simul(3,:)); axis  tight
-%title('hours')
-%subplot(2,2,4)
-%plot(oo_.endo_simul(4,:)); axis  tight
-%title('consumption')
-
-
 shocks;
-var epsilon;
-stderr 0.10;
+  var epsilon;
+  stderr 0.10;
 end;
 
-extended_path(periods=300,lmmcp);
+extended_path(periods=50,lmmcp);
 
 if any(oo_.endo_simul(strmatch('i',M_.endo_names,'exact'),:)<-1e-6)
     error('lmmcp tag did not work')
 end
-% // Plot 100 first periods of  the simulations
-% figure
-% subplot(2,2,1)
-% plot(oo_.endo_simul(strmatch('i',M_.endo_names,'exact'),1:101)); axis  tight
-% title('investment')
-% subplot(2,2,2)
-% plot(oo_.endo_simul(strmatch('y',M_.endo_names,'exact'),1:101)); axis  tight
-% title('output')
-% subplot(2,2,3)
-% plot(oo_.endo_simul(strmatch('L',M_.endo_names,'exact'),1:101)); axis  tight
-% title('hours')
-% subplot(2,2,4)
-% plot(oo_.endo_simul(strmatch('c',M_.endo_names,'exact'),1:101)); axis  tight
-% title('consumption')