Minor updates to unit tests.
Expanded “Matrix-like” contract unit test. This test is currently failing.