Refactor Matrix tests.