Change the option formatting for 'exec' and add in a test to verify that it works as expected.