Implemented missing case and fixed wrong application of visitor causing the combinatorial testing not to work. This fixes #313. Unrelated: Forgot to close bug 312. Close #312.