#1348 for debugging I had commented out the other option tests. This commit fixes that so all tests are run again.