Improved test/matrix with helper functions
Adding --long-options=with-values once again to dispatch