updated imports of unit tests after framework changes
simplified extraction of matrix properties