Update testing matrix to be more inclusive