MPG: Cleaned up the test_options.c demo a little