Fixed MPC tests that were broken when new-style comments were 
added.
Merge pull request #217 from drusk/fix_mpc_tests

Fixed MPC tests