Test matrix

Additional items for the test matrix