Added more to test matrix