Trying out mocha-matrix
Revert "Trying out mocha-matrix"

This reverts commit f4b2d75cc4d512c4ffd507b5b3bae9a7c47b40d8.