Add additionnal test source code and fix the composition of command line options.