New: enable any Contracts in the code during unit testing
New: drop support for CLI switches in the order they appear on the command line