Added MakeMatrix in fixture