Fixed MPC tests

Fixed MPC tests that were broken when new-style comments were added.