Fix for isse #1: option ambiguity fixer fails after -d regexp
Also expand the test-suite to include this case