Simplified the test matrix temporarly