Fork for improvements to matrix and test