fixed tests for matrix using new framework
reinstate subviews with new interface