Yet more thorough testing of composite matrices, fairly confident that it's correct now