Merge pull request #392 from pllab/matrix_update

Update matrix tests to be clearer about where the exception-causing errors occur

Author: mdko