Rewrite duplicate test

This is a small thing; I noticed that the tests `mixed short bool and capture` and `short and long` were actually the same test. So I rewrote the latter to actually test a short option and long option together.