[ticket/227] Reduce size of test matrix

B3P-227
Merge pull request #228 from marc1706/ticket/227

[ticket/227] Reduce size of test matrix