Expand test coverage matrix