Update testing matrices for coverage and speed